Refresh patches, removed applied

diff --git a/debian/patches/09_newer_expat.patch b/debian/patches/09_newer_expat.patch
index 1894d75baa84cd23107e93b7c01f4d8243675e8c..0e66e40d15cdbb3bfafa94d7264de2d74459a939 100644 (file)
--- a/debian/patches/09_newer_expat.patch
+++ b/debian/patches/09_newer_expat.patch
@@ -14,9 +14,11 @@ parser.
  IO/XMLParser/vtkXMLDataParser.h   | 3 +++
  2 files changed, 8 insertions(+), 1 deletion(-)
 
+Index: vtk9/IO/XMLParser/vtkXMLDataParser.cxx
+===================================================================
 --- vtk9.orig/IO/XMLParser/vtkXMLDataParser.cxx
 +++ vtk9/IO/XMLParser/vtkXMLDataParser.cxx
-@@ -47,6 +47,7 @@
+@@ -36,6 +36,7 @@ vtkXMLDataParser::vtkXMLDataParser()
    this->RootElement = nullptr;
    this->AppendedDataPosition = 0;
    this->AppendedDataMatched = 0;
@@ -24,7 +26,7 @@ parser.
    this->DataStream = nullptr;
    this->InlineDataStream = vtkBase64InputStream::New();
    this->AppendedDataStream = vtkBase64InputStream::New();
-@@ -99,6 +100,7 @@
+@@ -88,6 +89,7 @@ void vtkXMLDataParser::PrintSelf(ostream
  {
    this->Superclass::PrintSelf(os, indent);
    os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n";
@@ -32,7 +34,7 @@ parser.
    if (this->RootElement)
    {
      this->RootElement->PrintXML(os, indent);
-@@ -227,7 +229,7 @@
+@@ -214,7 +216,7 @@ int vtkXMLDataParser::ParsingComplete()
    // If we have reached the appended data section, we stop parsing.
    // This prevents the XML parser from having to walk over the entire
    // appended data section.
@@ -41,7 +43,7 @@ parser.
    {
      return 1;
    }
-@@ -448,6 +450,8 @@
+@@ -433,6 +435,8 @@ int vtkXMLDataParser::ParseBuffer(const
      {
        return 0;
      }
@@ -50,9 +52,11 @@ parser.
    }
  
    return 1;
+Index: vtk9/IO/XMLParser/vtkXMLDataParser.h
+===================================================================
 --- vtk9.orig/IO/XMLParser/vtkXMLDataParser.h
 +++ vtk9/IO/XMLParser/vtkXMLDataParser.h
-@@ -215,6 +215,9 @@
+@@ -204,6 +204,9 @@ protected:
    // How much of the string "<AppendedData" has been matched in input.
    int AppendedDataMatched;
  

diff --git a/debian/patches/gcc-13.patch b/debian/patches/gcc-13.patch
deleted file mode 100644 (file)
index e5261b6..0000000
--- a/debian/patches/gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1233ceec268d5366c66f5e79786ec784042b591b Mon Sep 17 00:00:00 2001
-From: Laurent Rineau <laurent.rineau@cgal.org>
-Date: Tue, 17 Jan 2023 16:18:53 +0100
-Subject: Add #include <cstdint> to compile with gcc13
-Origin: upstream, https://gitlab.kitware.com/vtk/vtk/-/commit/1233ceec268d5366c66f5e79786ec784042b591b
-
-The `vtkSEPReader` was introduced by MRs !4909 (from my former
-collaborator Maxime) and !4938. Then it was highly modified by
-!7516. The later MR is the one that introduced the uses of
-`std::uint8_t` and `std::uint32_t`.
-
-Those types needs the inclusion of `<cstdint>`.
----
- IO/Image/vtkSEPReader.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- vtk9.orig/IO/Image/vtkSEPReader.h
-+++ vtk9/IO/Image/vtkSEPReader.h
-@@ -25,8 +25,9 @@
- #include "vtkImageAlgorithm.h"
- #include "vtkNew.h" // for ivars
- 
--#include <array>  // for std::array
--#include <string> // for std::string
-+#include <array>   // for std::array
-+#include <cstdint> // for std::uint8_t and std::uint32_t
-+#include <string>  // for std::string
- 
- namespace details
- {

diff --git a/debian/patches/series b/debian/patches/series
index d39244272d8ee0fc478c1df15bcb8648bca52c13..dccd6ae80e9affd64e70f9bdae710091c82f15a1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 09_newer_expat.patch
-gcc-13.patch
 10_matplotlib.patch
 20_do_not_link_against_socket.patch
 30_drop_medical_example.patch